fix build

diff --git a/ChangeLog b/ChangeLog
index 89e903e899eec798dbec28b6d937c4af9fcc49fa..1c6aadbf5f2d36724762103d36502889c3a0df52 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-06-08  Matthias Clasen  <mclasen@redhat.com>
 
+       * tests/testprint.c: Update for api changes.
+
+       * gtk/gtkprintoperation.c: Fix some copy-and-paste errors,
+       and rename the pdf-target property to export-filename.
+
        * gtk/gtkfilechooserdefault.c: Turn off profiling code.
 
        * tests/print-editor.c: Update for api changes.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 89e903e899eec798dbec28b6d937c4af9fcc49fa..1c6aadbf5f2d36724762103d36502889c3a0df52 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2006-06-08  Matthias Clasen  <mclasen@redhat.com>
 
+       * tests/testprint.c: Update for api changes.
+
+       * gtk/gtkprintoperation.c: Fix some copy-and-paste errors,
+       and rename the pdf-target property to export-filename.
+
        * gtk/gtkfilechooserdefault.c: Turn off profiling code.
 
        * tests/print-editor.c: Update for api changes.

diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c
index c54dedd5cea90aa1450c77633c47c6d1b852591c..6d9821fd988e69b09d60377b94b89bc3aa04d203 100644 (file)
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -966,7 +966,7 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class)
    * Since: 2.10
    */
   g_object_class_install_property (gobject_class,
-                                  PROP_USE_FULL_PAGE,
+                                  PROP_TRACK_PRINT_STATUS,
                                   g_param_spec_boolean ("track-print-status",
                                                         P_("Track Print Status"),
                                                         P_("TRUE if the print operation will continue to report on the print job status after the print data has been sent to the printer or print server."),
@@ -1028,10 +1028,11 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class)
                                                         GTK_PARAM_READWRITE));
   
   /**
-   * GtkPrintOperation:pdf-target:
+   * GtkPrintOperation:export-filename:
    *
-   * The name of a PDF file to generate instead of showing 
-   * the print dialog. 
+   * The name of a file file to generate instead of showing 
+   * the print dialog. Currently, PDF is the only supported
+   * format.
    *
    * The intended use of this property is for implementing 
    * "Export to PDF" actions.
@@ -1043,10 +1044,10 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class)
    * Since: 2.10
    */
   g_object_class_install_property (gobject_class,
-                                  PROP_JOB_NAME,
-                                  g_param_spec_string ("pdf-target",
-                                                       P_("PDF target filename"),
-                                                       P_("PDF target filename"),
+                                  PROP_EXPORT_FILENAME,
+                                  g_param_spec_string ("export-filename",
+                                                       P_("Export filename"),
+                                                       P_("Export filename"),
                                                        NULL,
                                                        GTK_PARAM_READWRITE));
   

diff --git a/tests/testprint.c b/tests/testprint.c
index 2394d12b18517cf3618eb0c9bca0acd64483552b..e39c3a9914b22350f5cac85cac8a2cdf808eb83d 100644 (file)
--- a/tests/testprint.c
+++ b/tests/testprint.c
@@ -108,7 +108,7 @@ main (int argc, char **argv)
   print = gtk_print_operation_new ();
   gtk_print_operation_set_n_pages (print, 2);
   gtk_print_operation_set_unit (print, GTK_UNIT_MM);
-  gtk_print_operation_set_pdf_target (print, "test.pdf");
+  gtk_print_operation_set_export_filename (print, "test.pdf");
   g_signal_connect (print, "draw_page", G_CALLBACK (draw_page), NULL);
   g_signal_connect (print, "request_page_setup", G_CALLBACK (request_page_setup), NULL);
   res = gtk_print_operation_run (print, GTK_PRINT_OPERATION_ACTION_EXPORT, NULL, NULL);
@@ -116,7 +116,7 @@ main (int argc, char **argv)
   /* Test subclassing of GtkPrintOperation */
   print_file = test_print_file_operation_new ("testprint.c");
   test_print_file_operation_set_font_size (print_file, 12.0);
-  gtk_print_operation_set_pdf_target (GTK_PRINT_OPERATION (print_file), "test2.pdf");
+  gtk_print_operation_set_export_filename (GTK_PRINT_OPERATION (print_file), "test2.pdf");
   res = gtk_print_operation_run (GTK_PRINT_OPERATION (print_file), GTK_PRINT_OPERATION_ACTION_EXPORT, NULL, NULL);
   
   return 0;